Cleaned up file layout and added error pages