cleared up dir structure