Tidy default directory references
Code reorganization