Rework ClassPath