Jadler modularization. Closes #30
copyright changed to 2013