move away from modules - they can interact badly with other projects