Minor code rearranging
Created plugin structure
Reformatting
Create expander type to support other expansions
Rearrange some code