Finish persistance + Refactoring: split into files