Cleaning up, moved some more things to nice directory results thingie