Refactored button classes into their own package