Initial input from old cv
Updated to simplified file structure