Refactor into folders
Correct makefiles