Dev

Modularization of library, dragging #10.