Added more modules and started moving methods from the main JS into said modules