lots more cleanups, skeleton project file