Small code improvements, new name for src dir