Moved previous puzzles to puzzles dir
Re-factorings.