Remove unnecessary dirs
Add comments for main methods