v1.1.7
Rearranged source files