Preparation for wicketstuff subproject