Move keccak into seperate dir and get rid of crazy includes