Change directory structure and add new solutions