Refined Code & code structure

Refined Code & change ConfigurationWindow into plugin-in