Fixed configuration file location
Organised imports