Updates to the file structure to clean things up.