dev: Missed one class... now all classes have their own file, also fixed a docblock to return the proper object