Big rejig to simplify general folder and module structure