Cleaned up the file structure some.