Moved files to service sub directory