Reorganized code. Updated FXUtilities reference