First step towards modularization