Integrate proposed fxp v6 to current version gradually and restructure the current code for new features and fixes.