Directory restructuring, fixes #45