Changed layout of files and folders to split out functionality in later version.