Renaming subfolder to 'modules' so that the organization is simpler
Minor changes