Re-organzed library files and finished initial design on messages.