Re-arrange and remove some file for test If error make black screen