Reorganized files and made a Rakefile