Added componets and imports structure