Refactoring continues #3.8 + Swagger docs + fixes