diff --git a/exercises/affine-cipher/src/main/java/.keep b/exercises/affine-cipher/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/affine-cipher/src/main/java/AffineCipher.java b/exercises/affine-cipher/src/main/java/AffineCipher.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/affine-cipher/src/main/java/AffineCipher.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/all-your-base/src/main/java/.keep b/exercises/all-your-base/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/all-your-base/src/main/java/BaseConverter.java b/exercises/all-your-base/src/main/java/BaseConverter.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/all-your-base/src/main/java/BaseConverter.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/allergies/src/main/java/Allergies.java b/exercises/allergies/src/main/java/Allergies.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/allergies/src/main/java/Allergies.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/alphametics/src/main/java/Alphametics.java b/exercises/alphametics/src/main/java/Alphametics.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/alphametics/src/main/java/Alphametics.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/anagram/src/main/java/.keep b/exercises/anagram/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/anagram/src/main/java/Anagram.java b/exercises/anagram/src/main/java/Anagram.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/anagram/src/main/java/Anagram.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/atbash-cipher/src/main/java/.keep b/exercises/atbash-cipher/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/atbash-cipher/src/main/java/Atbash.java b/exercises/atbash-cipher/src/main/java/Atbash.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/atbash-cipher/src/main/java/Atbash.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/bank-account/src/main/java/BankAccount.java b/exercises/bank-account/src/main/java/BankAccount.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/bank-account/src/main/java/BankAccount.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/beer-song/src/main/java/.keep b/exercises/beer-song/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/beer-song/src/main/java/BeerSong.java b/exercises/beer-song/src/main/java/BeerSong.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/beer-song/src/main/java/BeerSong.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/binary-search/src/main/java/.keep b/exercises/binary-search/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/binary-search/src/main/java/BinarySearch.java b/exercises/binary-search/src/main/java/BinarySearch.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/binary-search/src/main/java/BinarySearch.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/bob/src/main/java/.keep b/exercises/bob/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/bob/src/main/java/Bob.java b/exercises/bob/src/main/java/Bob.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/bob/src/main/java/Bob.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/book-store/src/main/java/.keep b/exercises/book-store/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/book-store/src/main/java/BookStore.java b/exercises/book-store/src/main/java/BookStore.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/book-store/src/main/java/BookStore.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/bowling/src/main/java/.keep b/exercises/bowling/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/bowling/src/main/java/Bowling.java b/exercises/bowling/src/main/java/Bowling.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/bowling/src/main/java/Bowling.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/change/src/main/java/.keep b/exercises/change/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/change/src/main/java/ChangeCalculator.java b/exercises/change/src/main/java/ChangeCalculator.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/change/src/main/java/ChangeCalculator.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/circular-buffer/src/main/java/CircularBuffer.java b/exercises/circular-buffer/src/main/java/CircularBuffer.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/circular-buffer/src/main/java/CircularBuffer.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/clock/src/main/java/.keep b/exercises/clock/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/clock/src/main/java/Clock.java b/exercises/clock/src/main/java/Clock.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/clock/src/main/java/Clock.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/complex-numbers/src/main/java/.keep b/exercises/complex-numbers/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/complex-numbers/src/main/java/ComplexNumber.java b/exercises/complex-numbers/src/main/java/ComplexNumber.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/complex-numbers/src/main/java/ComplexNumber.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/crypto-square/src/main/java/.keep b/exercises/crypto-square/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/crypto-square/src/main/java/CryptoSquare.java b/exercises/crypto-square/src/main/java/CryptoSquare.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/crypto-square/src/main/java/CryptoSquare.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/custom-set/src/main/java/.keep b/exercises/custom-set/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/custom-set/src/main/java/CustomSet.java b/exercises/custom-set/src/main/java/CustomSet.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/custom-set/src/main/java/CustomSet.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/diffie-hellman/src/main/java/.keep b/exercises/diffie-hellman/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/diffie-hellman/src/main/java/DiffieHellman.java b/exercises/diffie-hellman/src/main/java/DiffieHellman.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/diffie-hellman/src/main/java/DiffieHellman.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/dominoes/src/main/java/Dominoes.java b/exercises/dominoes/src/main/java/Dominoes.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/dominoes/src/main/java/Dominoes.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/flatten-array/src/main/java/.keep b/exercises/flatten-array/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/flatten-array/src/main/java/Flattener.java b/exercises/flatten-array/src/main/java/Flattener.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/flatten-array/src/main/java/Flattener.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/food-chain/src/main/java/.keep b/exercises/food-chain/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/food-chain/src/main/java/FoodChain.java b/exercises/food-chain/src/main/java/FoodChain.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/food-chain/src/main/java/FoodChain.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/forth/src/main/java/.keep b/exercises/forth/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/forth/src/main/java/ForthEvaluator.java b/exercises/forth/src/main/java/ForthEvaluator.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/forth/src/main/java/ForthEvaluator.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/go-counting/src/main/java/GoCounting.java b/exercises/go-counting/src/main/java/GoCounting.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/go-counting/src/main/java/GoCounting.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/grade-school/src/main/java/.keep b/exercises/grade-school/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/grade-school/src/main/java/School.java b/exercises/grade-school/src/main/java/School.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/grade-school/src/main/java/School.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/grep/src/main/java/.keep b/exercises/grep/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/grep/src/main/java/GrepTool.java b/exercises/grep/src/main/java/GrepTool.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/grep/src/main/java/GrepTool.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/house/src/main/java/.keep b/exercises/house/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/house/src/main/java/House.java b/exercises/house/src/main/java/House.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/house/src/main/java/House.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/linked-list/src/main/java/.keep b/exercises/linked-list/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/linked-list/src/main/java/DoublyLinkedList.java b/exercises/linked-list/src/main/java/DoublyLinkedList.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/linked-list/src/main/java/DoublyLinkedList.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/matching-brackets/src/main/java/.keep b/exercises/matching-brackets/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/matching-brackets/src/main/java/BracketChecker.java b/exercises/matching-brackets/src/main/java/BracketChecker.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/matching-brackets/src/main/java/BracketChecker.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/meetup/src/main/java/Meetup.java b/exercises/meetup/src/main/java/Meetup.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/meetup/src/main/java/Meetup.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/minesweeper/src/main/java/.keep b/exercises/minesweeper/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/minesweeper/src/main/java/MinesweeperBoard.java b/exercises/minesweeper/src/main/java/MinesweeperBoard.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/minesweeper/src/main/java/MinesweeperBoard.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/nucleotide-count/src/main/java/.keep b/exercises/nucleotide-count/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/nucleotide-count/src/main/java/NucleotideCounter.java b/exercises/nucleotide-count/src/main/java/NucleotideCounter.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/nucleotide-count/src/main/java/NucleotideCounter.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/ocr-numbers/src/main/java/.keep b/exercises/ocr-numbers/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/ocr-numbers/src/main/java/OpticalCharacterReader.java b/exercises/ocr-numbers/src/main/java/OpticalCharacterReader.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/ocr-numbers/src/main/java/OpticalCharacterReader.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/palindrome-products/src/main/java/.keep b/exercises/palindrome-products/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/palindrome-products/src/main/java/PalindromeCalculator.java b/exercises/palindrome-products/src/main/java/PalindromeCalculator.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/palindrome-products/src/main/java/PalindromeCalculator.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/parallel-letter-frequency/src/main/java/.keep b/exercises/parallel-letter-frequency/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/parallel-letter-frequency/src/main/java/ParallelLetterFrequency.java b/exercises/parallel-letter-frequency/src/main/java/ParallelLetterFrequency.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/parallel-letter-frequency/src/main/java/ParallelLetterFrequency.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/pascals-triangle/src/main/java/.keep b/exercises/pascals-triangle/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/pascals-triangle/src/main/java/PascalsTriangleGenerator.java b/exercises/pascals-triangle/src/main/java/PascalsTriangleGenerator.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/pascals-triangle/src/main/java/PascalsTriangleGenerator.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/phone-number/src/main/java/.keep b/exercises/phone-number/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/phone-number/src/main/java/PhoneNumber.java b/exercises/phone-number/src/main/java/PhoneNumber.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/phone-number/src/main/java/PhoneNumber.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/pig-latin/src/main/java/.keep b/exercises/pig-latin/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/pig-latin/src/main/java/PigLatinTranslator.java b/exercises/pig-latin/src/main/java/PigLatinTranslator.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/pig-latin/src/main/java/PigLatinTranslator.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/poker/src/main/java/.keep b/exercises/poker/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/poker/src/main/java/Poker.java b/exercises/poker/src/main/java/Poker.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/poker/src/main/java/Poker.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/prime-factors/src/main/java/.keep b/exercises/prime-factors/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/prime-factors/src/main/java/PrimeFactorsCalculator.java b/exercises/prime-factors/src/main/java/PrimeFactorsCalculator.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/prime-factors/src/main/java/PrimeFactorsCalculator.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/pythagorean-triplet/src/main/java/.keep b/exercises/pythagorean-triplet/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/pythagorean-triplet/src/main/java/PythagoreanTriplet.java b/exercises/pythagorean-triplet/src/main/java/PythagoreanTriplet.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/pythagorean-triplet/src/main/java/PythagoreanTriplet.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/queen-attack/src/main/java/.keep b/exercises/queen-attack/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/queen-attack/src/main/java/QueenAttackCalculator.java b/exercises/queen-attack/src/main/java/QueenAttackCalculator.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/queen-attack/src/main/java/QueenAttackCalculator.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/rail-fence-cipher/src/main/java/.keep b/exercises/rail-fence-cipher/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/rail-fence-cipher/src/main/java/RailFenceCipher.java b/exercises/rail-fence-cipher/src/main/java/RailFenceCipher.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/rail-fence-cipher/src/main/java/RailFenceCipher.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/rectangles/src/main/java/.keep b/exercises/rectangles/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/rectangles/src/main/java/RectangleCounter.java b/exercises/rectangles/src/main/java/RectangleCounter.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/rectangles/src/main/java/RectangleCounter.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/robot-name/src/main/java/.keep b/exercises/robot-name/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/robot-name/src/main/java/Robot.java b/exercises/robot-name/src/main/java/Robot.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/robot-name/src/main/java/Robot.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/robot-simulator/src/main/java/Robot.java b/exercises/robot-simulator/src/main/java/Robot.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/robot-simulator/src/main/java/Robot.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/roman-numerals/src/main/java/.keep b/exercises/roman-numerals/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/roman-numerals/src/main/java/RomanNumerals.java b/exercises/roman-numerals/src/main/java/RomanNumerals.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/roman-numerals/src/main/java/RomanNumerals.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/run-length-encoding/src/main/java/.keep b/exercises/run-length-encoding/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/run-length-encoding/src/main/java/RunLengthEncoding.java b/exercises/run-length-encoding/src/main/java/RunLengthEncoding.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/run-length-encoding/src/main/java/RunLengthEncoding.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/series/src/main/java/.keep b/exercises/series/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/series/src/main/java/Series.java b/exercises/series/src/main/java/Series.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/series/src/main/java/Series.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/simple-cipher/src/main/java/.keep b/exercises/simple-cipher/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/simple-cipher/src/main/java/Cipher.java b/exercises/simple-cipher/src/main/java/Cipher.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/simple-cipher/src/main/java/Cipher.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/simple-linked-list/src/main/java/.keep b/exercises/simple-linked-list/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/simple-linked-list/src/main/java/SimpleLinkedList.java b/exercises/simple-linked-list/src/main/java/SimpleLinkedList.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/simple-linked-list/src/main/java/SimpleLinkedList.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/spiral-matrix/src/main/java/.keep b/exercises/spiral-matrix/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/spiral-matrix/src/main/java/SpiralMatrixBuilder.java b/exercises/spiral-matrix/src/main/java/SpiralMatrixBuilder.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/spiral-matrix/src/main/java/SpiralMatrixBuilder.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/sublist/src/main/java/RelationshipComputer.java b/exercises/sublist/src/main/java/RelationshipComputer.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/sublist/src/main/java/RelationshipComputer.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/tournament/src/main/java/.keep b/exercises/tournament/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/tournament/src/main/java/Tournament.java b/exercises/tournament/src/main/java/Tournament.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/tournament/src/main/java/Tournament.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/transpose/src/main/java/.keep b/exercises/transpose/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/transpose/src/main/java/Transpose.java b/exercises/transpose/src/main/java/Transpose.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/transpose/src/main/java/Transpose.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/two-bucket/src/main/java/.keep b/exercises/two-bucket/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/two-bucket/src/main/java/TwoBucket.java b/exercises/two-bucket/src/main/java/TwoBucket.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/two-bucket/src/main/java/TwoBucket.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/word-count/src/main/java/.keep b/exercises/word-count/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/word-count/src/main/java/WordCount.java b/exercises/word-count/src/main/java/WordCount.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/word-count/src/main/java/WordCount.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/word-search/src/main/java/WordSearcher.java b/exercises/word-search/src/main/java/WordSearcher.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/word-search/src/main/java/WordSearcher.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/wordy/src/main/java/.keep b/exercises/wordy/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/wordy/src/main/java/WordProblemSolver.java b/exercises/wordy/src/main/java/WordProblemSolver.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/wordy/src/main/java/WordProblemSolver.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/zebra-puzzle/src/main/java/.keep b/exercises/zebra-puzzle/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/zebra-puzzle/src/main/java/ZebraPuzzle.java b/exercises/zebra-puzzle/src/main/java/ZebraPuzzle.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/zebra-puzzle/src/main/java/ZebraPuzzle.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/
diff --git a/exercises/zipper/src/main/java/.keep b/exercises/zipper/src/main/java/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/exercises/zipper/src/main/java/Zipper.java b/exercises/zipper/src/main/java/Zipper.java
new file mode 100644
index 000000000..6178f1beb
--- /dev/null
+++ b/exercises/zipper/src/main/java/Zipper.java
@@ -0,0 +1,10 @@
+/*
+
+Since this exercise has a difficulty of > 4 it doesn't come
+with any starter implementation.
+This is so that you get to practice creating classes and methods
+which is an important part of programming in Java.
+
+Please remove this comment when submitting your solution.
+
+*/