Minor fixes and directory changes.