move files out of lib into classes