Re-organized file structre