Some tests and organice some folders