Total refactoring and added deploy using Capistrano