Moving in files from solution
Correcting structure
Updated and moved over tests