Re-organized file structure