Updated file structure and made some changes.