added new module organization system with subfolders