Changed package.* to folders