Major re-factor

Made package names all lower case