Major refactor

Really no need to have all those different modules...