split up methods
changed directories