Moved make files around
Moved make files around