Refactor to  com.goat2goat.bifrost