fixed cleanup to fit new src layout