Restructuring for better scalability (i.e., emulating the awesome ngbp project structure)