Move to package com, add test and spring test