Fixes for small bugs.
Change in paths.
Ready for encapsulation to the Training Module.