Hammer out new application structure