Solution cleanup, moved controls into separate folder and adjusted namespaces