Added more functions and more granular dirs