Moved cldECS files out of subfolder for easier cloning and linking

I realized that if anyone cloned the repo they'd have to do some stupid
directory path stuff to include it appropriately. Fixed the ECS-Test
accordingly as well.
Merge branch 'beta' of https://github.com/hellocld/CLD-ECS into beta