Refactored to reflect new directory structure