Moving the code to src dir, whitespace changes