Rearrange to work with package managers