Some restructuring to support one structure and fill in content with Java, waiting for Nick to help with the Java