Added drawIt and ParseFailure and reorganized module