Fan/Current Module Refactoring
Preliminary Module Layouts