Fix thumbnail reference
Move some folder import methods to Java