reorganised files, first stage of #4
merged local changes, re: #4