adding some folders and minor fix related to namespace