Restuctured app to use pugins instead of embeded code