Refactor - Moved files to top level