Folder strucure updated for expension