Reorganize
Switch from Makefile to Rakefile