More clean-up in directories. Changed addon behavior