ok
added loader class
classes cleanup