Using View-Objects now instead of Objects
Rearranged classes into imho better package structure
Cleaned imports