lots of refractoring and clean up

package name changes
Merge pull request #3 from Professorvennie/scr

lots of refractoring and clean up