Better organization of Compass extension