Configuration moved to a separate file

Configuration moved to a separate file
Several comments added