Fixed paths in Rake, updated comments, reorganized