Refactoring the things
Updated submodules