More services and restructure of main stuff