Added packages, changed directory tree