Initial changes, remove packages from directory & cleanup a little