Finishing directory restructure. Closes #17.