MEDIUM / Reorganize resources + fixed some unit tests