Adding in simple authentication
Restructuring solution