remove unused file and do some restructuring