Refactor project. Tested successfully on Fuse 6.1