Clean up old code
Move top x stuff up
Plot source + organization