moved constants inside Core module
fixed dependencies