Reorganizing into more appropriate packages and added TomEE config