naming conventions, and moved to libraries