Made the module to be split across files