clean up code organize files better