updated directory structure (and bugle references)