Moved tests around
Initial cleanup

Next is the makefile :D
Updated with new and improved makefile
Updated bin folder to makefile