Remove tracked files from public, add to static (#642)

Remove tracked files from public, add to static (#642) #1567