Fixed structure to not have src folder
Fixed test