Extracted CStorage to a separate class, added makefile