add Constants and move Classes