first changes, not compilable
package renaming; entities with factories
less compilation errors
less compilation errors (only MainModel and MainActivity left)