Reorganized the core assets (see #776)