Rename structs to structures
Move primitves over to separate file.