Minor restructure, version 0.5.4