File cleanup

I'm also doing the exercises in here, so I cleaned up the directory a
bit, added some hierarchy.