Changed folder struture