added a bit more structure and removed the sensio plugin