activity: cleanup in Activity
activitiy: moved Energy back to server repo
Moved User and Activity to beans package