Organized projects in to new tools based directory structure