We don't need Builder#primary_name now we have relative paths
Method cleanup
Use standard File methods for path manipulation