lots of changes, mainly changing file/directory layout