Created folder service/datahandling and moved related files into that