changed up directory structure