reworked the directory structure and project names