Fix the folder structure

I figured out how I messed up earlier, and am fixing it , by moving the subfolders out of a nested ci-design inside ci-design :-/
Signed-off-by:James L Parry <jim_parry@bcit.ca>