Design changes

This is mainly for you to check out the changes, comment, thoughts.

The app runs, but I haven't added any controllers to experiment and see how the relationships work.