Directory structure and compilation structure changes