Refactoring to multiple modules
Basic styling