Changed structure slightly
0.0.4