restructure so that path lead into pre-build classes