Reorganized file structure to more familiar setup.