Add variables. Restructure directories.