Updating to 1.5.1 with complete restructure