Adding more functions and directory structure