Adding a test to test 404 responses. Also some restructuring packages
for better clarity / documentation.