Going to restructure project with further submodules
Removed something