Moved directories to make static analysis easier