Remove deprecated code
Organize sources
Finish implementation