Intermediate work
Directory re-structure