* Update folder structure * Correct project files * Move test folder * Some changes after Yuki's comments