cleaned up dir structure