Set up yard
Clean up and reorganize code