All source now in src directory