Reorginized into folders and added executable