Formatted all the things, merged makefiles to one