Restructured Main File Again