[neo-project/neo] refactoring (#288)

Can you wait at least 3 days or 72 hours from now before merging this to master. I’d like to do some testing also,and I hadn’t previously had time to give this attention.