Cleaning up file structure and renaming headline to be client-agnostic