acu72909 - do not use sub-directories for resource and provider under libraries
acu72909 - minor updates