cleanup and structure
0.2.1