cleanup and renaming
implemented storage and tests