Cleaned up dir structure