** Removed extra import
** Refactored nested -> standalone classes