Fixed a file name issue and improved organization.