Refactor folder and file structure