Made some changes to the directory layout