Made refactoring and changed build configuration to x64.