Cleanup

Organizing assets, bug fixes, etc.