Changed the directory structure significantly.