Cleanup and rearranging for capistrano-base