diff --git a/resources/views/account/accept-asset.blade.php b/resources/views/account/accept-asset.blade.php
index 73d1dd0baa..fcb4d3ec56 100644
--- a/resources/views/account/accept-asset.blade.php
+++ b/resources/views/account/accept-asset.blade.php
@@ -11,7 +11,7 @@
 @section('content')
 
     
-<link rel="stylesheet" href="{{ asset('assets/css/signature-pad.css') }}">
+<link rel="stylesheet" href="{{ asset('css/signature-pad.css') }}">
 
 <style>
 .form-horizontal .control-label, .form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline {
@@ -93,7 +93,7 @@
 
 @section('moar_scripts')
 
-    <script src="{{ asset('assets/js/signature_pad.min.js') }}"></script>
+    <script src="{{ asset('js/signature_pad.min.js') }}"></script>
     <script>
         var wrapper = document.getElementById("signature-pad"),
                 clearButton = wrapper.querySelector("[data-action=clear]"),
@@ -133,4 +133,4 @@
         });
 
     </script>
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 1c4dca652f..afffce3532 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -367,7 +367,7 @@
 @if ($snipeSettings->load_remote=='1')
     <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 @else
-    <script src="{{ asset('assets/js/plugins/chartjs/Chart.min.js') }}"></script>
+    <script src="{{ asset('js/plugins/chartjs/Chart.min.js') }}"></script>
 @endif
 
 
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index f5e8b31f61..ee474b5f45 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -451,7 +451,7 @@
     });
 </script>
 
-<script src="{{ asset('assets/js/pGenerator.jquery.js') }}"></script>
+<script src="{{ asset('js/pGenerator.jquery.js') }}"></script>
 
 <script>
 
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index 2f4f5e4bdc..f09aadc9e2 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -9,26 +9,26 @@
     <title>Snipe-IT</title>
 
     <!-- CSS -->
-    <link rel="stylesheet" href="{{ asset('assets/css/bootstrap.min.css') }}">
+    <link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}">
     <!-- Font Awesome -->
-    <link rel="stylesheet" href="{{ asset('assets/css/font-awesome.min.css') }}">
+    <link rel="stylesheet" href="{{ asset('css/font-awesome.min.css') }}">
 
     <!-- Select2 -->
-    <link rel="stylesheet" href="{{ asset('assets/js/plugins/select2/select2.min.css') }}">
+    <link rel="stylesheet" href="{{ asset('js/plugins/select2/select2.min.css') }}">
 
     <!-- Bootstrap Color Picker -->
-    <link rel="stylesheet" href="{{ asset('assets/js/plugins/colorpicker/bootstrap-colorpicker.min.css') }}">
+    <link rel="stylesheet" href="{{ asset('js/plugins/colorpicker/bootstrap-colorpicker.min.css') }}">
 
-    <link rel="stylesheet" href="{{ asset('assets/js/plugins/datepicker/bootstrap-datepicker.css') }}">
+    <link rel="stylesheet" href="{{ asset('js/plugins/datepicker/bootstrap-datepicker.css') }}">
 
     <!-- jvectormap -->
-    <link rel="stylesheet" href="{{ asset('assets/js/plugins/jvectormap/jquery-jvectormap-1.2.2.css') }}">
+    <link rel="stylesheet" href="{{ asset('js/plugins/jvectormap/jquery-jvectormap-1.2.2.css') }}">
     <!-- Theme style -->
-    <link rel="stylesheet" href="{{ asset('assets/css/AdminLTE.min.css') }}">
-    <link rel="stylesheet" href="{{ asset('assets/css/skins/skin-blue.css') }}">
+    <link rel="stylesheet" href="{{ asset('css/AdminLTE.min.css') }}">
+    <link rel="stylesheet" href="{{ asset('css/skins/skin-blue.css') }}">
 
     <!-- bootstrap tables CSS -->
-    <link rel="stylesheet" href="{{ asset('assets/css/bootstrap-table.css') }}">
+    <link rel="stylesheet" href="{{ asset('css/bootstrap-table.css') }}">
 
     <link rel="stylesheet" href="{{ elixir('assets/css/app.css') }}">
     <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
diff --git a/resources/views/layouts/setup.blade.php b/resources/views/layouts/setup.blade.php
index 1c9178931a..affc0bfb79 100644
--- a/resources/views/layouts/setup.blade.php
+++ b/resources/views/layouts/setup.blade.php
@@ -8,13 +8,13 @@
       </title>
 
          <!-- CSS -->
-          <link rel="stylesheet" href="{{ asset('assets/css/bootstrap.min.css') }}">
+          <link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}">
           <!-- Font Awesome -->
-          <link rel="stylesheet" href="{{ asset('assets/css/font-awesome.min.css') }}">
+          <link rel="stylesheet" href="{{ asset('css/font-awesome.min.css') }}">
           <!-- Theme style -->
-          <link rel="stylesheet" href="{{ asset('assets/css/AdminLTE.min.css') }}">
-          <link rel="stylesheet" href="{{ asset('assets/css/skins/skin-blue.css') }}">
-        <link rel="stylesheet" href="{{ asset('assets/js/plugins/select2/select2.min.css') }}">
+          <link rel="stylesheet" href="{{ asset('css/AdminLTE.min.css') }}">
+          <link rel="stylesheet" href="{{ asset('css/skins/skin-blue.css') }}">
+        <link rel="stylesheet" href="{{ asset('js/plugins/select2/select2.min.css') }}">
           <link rel="stylesheet" href="{{ elixir('assets/css/app.css') }}">
 
 
diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php
index 36fa5e174c..60fd8354c6 100644
--- a/resources/views/reports/accessories.blade.php
+++ b/resources/views/reports/accessories.blade.php
@@ -48,12 +48,12 @@
 
 
 @section('moar_scripts')
-<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
+<script src="{{ asset('js/bootstrap-table.js') }}"></script>
+<script src="{{ asset('js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
+<script src="{{ asset('js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
+<script src="{{ asset('js/extensions/export/bootstrap-table-export.js') }}"></script>
+<script src="{{ asset('js/extensions/export/tableExport.js') }}"></script>
+<script src="{{ asset('js/extensions/export/jquery.base64.js') }}"></script>
 <script type="text/javascript">
     $('#table').bootstrapTable({
         classes: 'table table-responsive table-no-bordered',
diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php
index 1a6e52b9d9..05ac4e1db3 100644
--- a/resources/views/reports/asset_maintenances.blade.php
+++ b/resources/views/reports/asset_maintenances.blade.php
@@ -90,12 +90,12 @@
 @stop
 
 @section('moar_scripts')
-<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
+<script src="{{ asset('js/bootstrap-table.js') }}"></script>
+<script src="{{ asset('js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
+<script src="{{ asset('js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
+<script src="{{ asset('js/extensions/export/bootstrap-table-export.js') }}"></script>
+<script src="{{ asset('js/extensions/export/tableExport.js') }}"></script>
+<script src="{{ asset('js/extensions/export/jquery.base64.js') }}"></script>
 <script type="text/javascript">
   $('#table').bootstrapTable({
       classes: 'table table-responsive table-no-bordered',
diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php
index 02315ee355..5b0d38aa1e 100644
--- a/resources/views/reports/depreciation.blade.php
+++ b/resources/views/reports/depreciation.blade.php
@@ -141,12 +141,12 @@
 @stop
 
 @section('moar_scripts')
-<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
+<script src="{{ asset('js/bootstrap-table.js') }}"></script>
+<script src="{{ asset('js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
+<script src="{{ asset('js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
+<script src="{{ asset('js/extensions/export/bootstrap-table-export.js') }}"></script>
+<script src="{{ asset('js/extensions/export/tableExport.js') }}"></script>
+<script src="{{ asset('js/extensions/export/jquery.base64.js') }}"></script>
 <script type="text/javascript">
     $('#table').bootstrapTable({
         classes: 'table table-responsive table-striped table-bordered',
diff --git a/resources/views/reports/licenses.blade.php b/resources/views/reports/licenses.blade.php
index 4c77c268ab..7977b7fb0d 100644
--- a/resources/views/reports/licenses.blade.php
+++ b/resources/views/reports/licenses.blade.php
@@ -71,12 +71,12 @@
 @stop
 
 @section('moar_scripts')
-<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
+<script src="{{ asset('js/bootstrap-table.js') }}"></script>
+<script src="{{ asset('js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
+<script src="{{ asset('js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
+<script src="{{ asset('js/extensions/export/bootstrap-table-export.js') }}"></script>
+<script src="{{ asset('js/extensions/export/tableExport.js') }}"></script>
+<script src="{{ asset('js/extensions/export/jquery.base64.js') }}"></script>
 <script type="text/javascript">
     $('#table').bootstrapTable({
         classes: 'table table-responsive table-no-bordered',
diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php
index c72cc6ea03..6a331c3881 100644
--- a/resources/views/reports/unaccepted_assets.blade.php
+++ b/resources/views/reports/unaccepted_assets.blade.php
@@ -60,12 +60,12 @@
 @stop
 
 @section('moar_scripts')
-<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
+<script src="{{ asset('js/bootstrap-table.js') }}"></script>
+<script src="{{ asset('js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
+<script src="{{ asset('js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
+<script src="{{ asset('js/extensions/export/bootstrap-table-export.js') }}"></script>
+<script src="{{ asset('js/extensions/export/tableExport.js') }}"></script>
+<script src="{{ asset('js/extensions/export/jquery.base64.js') }}"></script>
 <script type="text/javascript">
     $('#table').bootstrapTable({
         classes: 'table table-responsive table-no-bordered',
diff --git a/resources/views/settings/edit.blade.php b/resources/views/settings/edit.blade.php
index baf7b63724..6f43a8a738 100755
--- a/resources/views/settings/edit.blade.php
+++ b/resources/views/settings/edit.blade.php
@@ -22,7 +22,7 @@
 </style>
 
 <!-- Bootstrap Color Picker -->
-<link rel="stylesheet" href="{{ asset('assets/js/plugins/colorpicker/bootstrap-colorpicker.min.css') }}">
+<link rel="stylesheet" href="{{ asset('js/plugins/colorpicker/bootstrap-colorpicker.min.css') }}">
 
 {{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'role' => 'form' ]) }}
 <!-- CSRF Token -->
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index acf74e2aff..76badf683c 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -14,7 +14,7 @@
     }
 </style>
 <!-- Bootstrap Color Picker -->
-<link rel="stylesheet" href="{{ asset('assets/js/plugins/colorpicker/bootstrap-colorpicker.min.css') }}">
+<link rel="stylesheet" href="{{ asset('js/plugins/colorpicker/bootstrap-colorpicker.min.css') }}">
 @parent
 @stop
 
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 9bdf52358a..493921352a 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -540,7 +540,7 @@ $('.header-name').click(function() {
 })
 </script>
 
-<script src="{{ asset('assets/js/pGenerator.jquery.js') }}"></script>
+<script src="{{ asset('js/pGenerator.jquery.js') }}"></script>
 
 <script>
 
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 3e4e1a2580..4c0654f27b 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -382,8 +382,8 @@
               </div>
             </div>
 
-            <link rel="stylesheet" type="text/css" href="{{ asset('assets/css/lib/jquery.fileupload.css') }}">
-            <link rel="stylesheet" type="text/css" href="{{ asset('assets/css/lib/jquery.fileupload-ui.css') }}">
+            <link rel="stylesheet" type="text/css" href="{{ asset('css/lib/jquery.fileupload.css') }}">
+            <link rel="stylesheet" type="text/css" href="{{ asset('css/lib/jquery.fileupload-ui.css') }}">
 
             <div class="col-md-12 col-sm-12">
               <div class="table-responsive">