Refactored project to use internal modules for

each file