Initial re-commit

Major subDir overhaul