Restructuring, own directory for each element.