Restructured custom modules folder