Better structuring
Removed shadows, fixed typo in filename