organize files and improve interface design