Updated source folders to be more organized.