fixed some lib require problems. started reorganizing