Adding base structure for module and tests