moving things to proper dirs
more cleanup
chaning popup font size
dumb merge conflicts here...