Changed rakefile and moved files to be according to it
Removed the files
some feel more changes