rearrange files to accomodate Rakefile