Changed structure of working dir. Modified main file.