Improved directory logic and includes updated todos