Added packages, changed directory structure