Moved everything out into the main directory