Proper commit of new modular structure