Moved services from incorrect package structure