Renamed and restructured module
0.3.4