Changed folder structures, added Trace