Partially structured the project, separated KV files