Refactor: Data: Move circles into own files