remove redundant instance variables
add json fixtures
move stuff around, add new core entities