some more re-organizations
restructured directories
cleaning up