Refactor - Keep spec in separate package.