Moved packages and added multibindings for a flexibile architecture.