reorganized some things
made cysolve proper package