Reworked directory structure to extension standard
Reworked directory structure to extension standard