Tidying

Some stuff I forgot to push, mostly reorganizing so that programs(mains)
can be organized