Updated Project Structure to mimic OUW Structure