Moved components/systems back to single location (again)