Reorganize custom block in a single package