Consolidated code into app.rb
Removed unused file
Cleaned up the rakefile