Refactored files to folders