Loads of changes
Rename table
Fix associations
add angular