Organize files and remove static dir