Untracked laptop work (11/11/2014)
Reorganization