Refactor the file structure again