Big file reorganization. Closes #19