Version 1.5.0

Fundamental refactoring