Rearrange files
Code style updates
Rearranging things