reorganised folder structure + added models for the future