Change Folder Hierarchy

* Well nobody is perfect....

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>
Add Old Stuff Back

* We don't want to cause any problems so we'll add this back.

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>