Use Rakefile
...
rename folders
clean up code