Doing some code cleanup, fixing FML locations (Please be right github account)