Restructuring application further