Moved code to src folder, nicer makefile