move classes to standard lib location
small copy changes