Directory restructure + Module registering syntax

Refactored module registering syntax into seperate class