Restructuring everything. Simplifying running of scripts.
Resolving conflict