Initial import with component structure