File structure fixes

My merges were bad.