Rearranged directory structure.  Now needs fix.
New directory structure working