Refactored script so it's easier to add an remove modules