Project structured refactored.
Exercise up to end of module 4