code clean up/ img file restructure