uncomment
refactored all files into a single binary