Fix directories and stuff