some constants
folder structure changed