Globals fix, rename src to apps