Latest changes, removed submodule dirs
Added new files