Moved components from unsorted to appropriate modules.