Updated directories and refactored classes