working project structure. mostly.
resolving conflict