consolidate source
consolidate source
remove redun files