Cleaned up file structure.