Reorganized the source and updated to 1.4.7