Added structure besides classes and assets