Fixed Dir structure

Fixed dir structure, got rid of /daft/draft/draft etc