folder not needed anymore
improve code