Remove fml debuggy thing
Reorganize some files