Trying to fix the repository layout