Changing directory structure back. Starting work on build tool setup