Reorganize package structure

Move services to under the app package, and create package for entity
tests.