added packages and flattened filespace