Reorganized project, added pullups for buttons