* Refactoring & mass cleanup

* Fixed asset crashes