Reorganized heirarchy to improve performance, removed bloaty APC caching