Error handling and Bug Fixes related to new folder architecture.