Refactoring file structure, removing express