Appfog integration + Data layer reorganization