filestorage re-org and cleanup