Cleaned up dir structure.