Updated version, restructured files for resource loading optimization