More cleanup, added nice directory structure