Clean up files
Add sample points and improve structure