Restructuring files and checking angular has been included properly