Project reorganisation and setup