Restructure to get ready for self-hosting