Code clean-up; normalized app namespaces to 'clumsy'; various fixes and improvements