Sorting out directory structure
Tidying up build system