Fixed Path Issues

Several files were being linked from varying locations. Locations
combined into parent location now.