Changed structure of packages, add some classes