restructured folder layout to seperate custom elements.