Reorganized asset structure and made several design changes