changed some code
moved files into conc directory and added some exception handling