with commented code
Refactored directory as it was crap (excuse my french)