Changed structure, Added Template Engine, Added Messages and Errors
Merged confilcts