Reorganize code for bluemix


Bluemix requires that the app be in the top level directory (at least for right
now), so let's play along and do that.

This is more work on task 2160.

Signed-off-by: Aidyl < myemail >