Improved code layout
0.1.8