Begin restructuring this application