Restructiring the project topology; consolidating the storage libraries into one and adding the second module.