WIP - removing old crap
WIP - moving around files for better organization