debug from design + updating files structures