Adjusting repository structure in branch 0.3.