Moved files around, made the Makefiles more complicated