fix package declaration to match folder hierarchy