Plugin files organisation / #27