Feature/refactor rakefile