Restructuring everything. Simplifying running of scripts.