bug fixes and improvements in the files/folders structure