Reorganized - Applied shared files