Add draw function.
Rename functions, add directory for common functions.