re-arranged  directory structure