Rearrange files

Neaten up repo by following format