Fixed folder structure and added check to exe