Minor changes
Restructered to the simple application without all the template stuff