got rid of logic.cc, created subdirectories, simplified build file