reording of files and updating some apis