Migrating components to correct folder :)