moved files into new project structure.
moved files into new project structure.
Fixes for new directory structure.