updating to 0.6.6.3, reorganizing file structure