Moved some content classes to follow structure in api and space