move to src dir
fix formatting, small update