Rename and cleanup file structure