Updated src and res folder