moved files into "library", removing need for startup include