Organizing repo. Fixing dependancies.