Added conference work and reorganized folders