added Storage and Server, somewhat fixed logic errors in delMovie