Removed leftover System reference
Update namespaces, getting ready for packaging