Updated file structure, and implementing functionality