modified folder structure so that sub-modules wont conflict when minified
solved submodule conflicts