Changed the file organization to match doodles repo