Moved data models around.
Fixed typos