Changed project to become a multi module