code cleanup and new version of FileStorage Modules