directory restructure and some nice additions