Added a better 404
Renamed Templates to templates for compatibility reasons
Cleanup