Reorganize and add Rakefile