Cleaning up. Features that will be excluded from the 2014 version are moved to a subfolder.