Directory structure fixes