Fix formatting and naming. Remove sample sources