moved classes from src/ to lib/