Reorganized project 

Should be a lot more clean. Didn't remove anything just moved it around.