Restructured packages and package content and refactores class names