Organising some files. Started writing Tests.