Edited the whole structure of SFXR++