Moved files and changes for new structure and cmake