more moving assests in preperation for deletion
deleted junk, moved files around
Deleted crap from assets folder
Merge branch 'master' into HEAD
Assets cleaned up. If things break revert to Alpha build commit