Bugfixes, put swapped some variables between hybrid/hybdat datatype, moved files from xc-pot to hybrid