Cleaned Up Directory Structure removing Scripts and Templates... to go with Feature Based Directory