Re-organized file structure.