some small changes, moved directory structure