Reorganizing to match KoiosJS structure