some fixes due to the reorganization of file structure