Implemented classes from TODO folder
Clean & refactor example project