Renamed folders and modified package expressions.