Re-structured the file hierarchy a little.