Rearrange code and libs, fixed pressue values push