Get things working and in right folders