Further cleaning. Initial commit of funcionalities workers