moved some files around
minor changes to paths