Architecture: moved files to component subdirs