restructure dirs (classes dir)