Modifying structure of code for updated repo. Also adding first a single commandlet.