Some tests and organise folders