Better type casts
Reorganised file structure