Rearrange files a bit and start to add Rake tasks