New file structure and did some trail and error.