Fixed up directory structure