Restructured project
Update some variables