Arrange tests more nicely in folder structure