Modified after Frankie's suggestions.

Also put everything in a proper subdirectory.