Added dispose functionality and corrected directory structure