Done with basic CRUD
Merged with Erin's changes, had to move some directories around.