improved file system structure and code build