bug fixes
few changes to structure of the files