update rakefile
updated directories
updated server
fixed merge