Changed bare to legacy & move dependencies to dev