rearrange files a bit

migrate to docopt