restructure assets, commenting unused code