minor cleanup
restructure custom plugins