more problems
pushed some more directories around