moved conf in single file
removed extra files