Add base paths
Remove redundant PATH components