It Works!

Reorganised code. More modular now, wil lbe more handy to collaborate