move some stuff

Signed-off-by: Tachyony <tachyony@live.co.uk>
clean out junk, don't think we will need this

Signed-off-by: Tachyony <tachyony@live.co.uk>