bug fixes and folder renaming