Updated file structure and added BST