Cleaned it - fixed dependendies
Cleaning/arranging code
.