package name changes
package name changes, etc
fixed path utils
reformat