Moved everything into a single module for a more easy transition