Refactor
Change cmakelists
REstructure