re-arranged directory structure