fp: Minor file structure updates