Adjustments to make it run on AWS after projects organisation