File organization. Closes #246