Move to a more workable structure to play with cloud foundry