Mockup 2
Move everything into the src folder...