Add Rakefile and change directory structure