Moved code to suitable classes/files

Signed-off-by: Khouderchah-Alex <alex.khouderchah@gmail.com>