removed old comments, restructured dir