Removed duplicated folder-structur - my fault -.-