Adding functionality

Reorganised folder structure
Added materials
Add swap logic