Build fixes. Continued improvements in files structure.