Changed folder structure for top-level and client