Re-arranged the file structure.