Refactoring > Putting demo code under demo src folder