Fix force close(??) + new package for adapters