Fix few errors but don't make it working + rename files