Saner directory structure
Let's work on challenge 3