refactored packages and file name and remove extra solutions at the same time