Remove the previous commit and moving the core service blueprint to
right place.