classes moved to the right place