Changed name of common code dir
Memory management