Handle module dir by splitting camel case
Minor updates