moved stuff around

preparing for new codes