Moved everything into another module, using blueprint