Internal package restructure

jlgm => math to make additions more sensable