replace classes with placeholders
reorganised directory