removed custom assert
fixed folder structure