Remove useless package and moved file to src root