Make slightly prettier; organize files