updates

various improvements, bug fixes, and renamed/reorganized files

package is still not yet functioning