Moved more parts into the package
Some updates