Update: project split into different files + small fixes