Remove tons of unneeded files and restructure the service directories