Rename #21
Move into directories closes #21