Restructured files for easier access