Fix localization; Move fpoint to separate file and rename it