Moved the interesting classes up to the root directory