Reorganized folders and added build number