Refactorizing Constants and Variables modules