Removed imports and took out external comfig class